Refactor structure.
Restructure directory.