streamline version control workflow, restructure