packages renamed. started merged build cmake files