fixed build script, project dir structures