Converted the project from a module project to it's own
fixed merge errors
Fixing merge issues