changed directory structure to modular approach