updating directory structure.. painfully. Bloody submodules.