reorg code with versioncake