reorganized project a bit