Project structure changed to commons + as + gs