Complete file structure for build
Code clean up