Refactored for simplier directory structure