Cleaning up, Added Autoloader