organize project a bit