cleaning up project layout