Added a new file structure, and new versioning scheme