Cleanup file arrangement and build scripts.