Changed structure of the entire project
Fixed conflicts and updated references