Changed project's hierarchy

Added groups, changed hierarchy