Moving classes into Roto folder