Refactor directory structure

Another solution for #2