more work on project layout. added more classes