Cleaned code:
Removed temp files (~)
Added missing files