modified build files to use new build structure