Adding source
Removing old stuff
Re-organization
Removed swap file