restructured the files and fixed the autoload issue