restructure project a bit