Separating out the stage classes into their own directory.