Removed uneccessary includes. Fixed any issues with moving directories around. Fixed autoloader