updating directory structure to be parallel between main and tests