restructured the build src classes