WIP on refactor; files renamed