Reorganized project a bit