restructured directories and changed build script