Branch arch + rename
Restructure + basic architecture
Cleaning up
Add main as template