Changed project directory structure in preparation for total rewrite
Prepare for total rewrite