cleanup and restructure project hierarchy