Start thinking about :name and :result dive types
Move everything into folders
More refactorings and moving of files
More improvements in simplicity