Rename for clarity
Move files to their own folder
R# fix namespaces
R# rename
relayout line
R# inline
Remove redundant code
Extract result class to deduplicate work