Removed duplicate files and unused folders