Refactor dir structure. Improve UI.