Updated new build system to use a directory structure closer resembling the old one for building