Fixing Architecture
Removing Junk files