moved everything to one build file and reformated the build file