Reorganized
Removed swap files
Removed old files