Adjusting file structure
More file structure changes

Filling up the Changelogs