Updated folder structure and build script