changed directory structure, added modules