Refactor directory structure. (1.0.1)