Cleaned up main files a bit more!

removed loads of imports!