Refactored directory structure
README tweak