Ray - Seperated classes into seperate files