Classes were in the wrong files