Removed some hard-coding
Removed alot of excess files