Restructure directories, create new version
git is weird