refactor folder names to remove version
making progress