Move folders around to match conventions
Move to using a build script