committing merge conflicts
Chnges to file structure