[master] Project structure update and build failure fix