Cleaning up directory structure; trying to keep history
Merging local and remote