TASK Restructure files for versioning