Creating a proper repo structure
Fix merge conflicts