Renamed files
Removed garbage
Simplified code.