Restructured project and fixed autoloading