Split project up into 3 parts
Fixed merge conflict