Merge

Merged branches and got rid of that extra project within the project