further changes to maven/project hierarchy and added folder for c186p2