refactored directory/file structure