Refactor directory structure more