Better directory structure
Refactor