Fixing error addition of projects. Moving projectBC file folder and resolving their conflicts.
Fixing conflicts.