Rebuilt project structure to allow for app+build folders