updated directory structure to better fit themes and modules