Seperated classes into Module files in order to organize