changed directory structure to allow other components