refactored directory structure. still a work in progress