refactored app classes into correct sub projects