Refactor Stage. Backing up current version before splitting into multiple classes