Removed unwanted files, optimized the directory structure