Refactor directory structure
Curry