Removed unused code files, cleaned up file and function names, merged some files for better organization