Refactored directory structure
Updated readme