Main change organization of project - moved packages