Add base
Clean up base
Merge branch 'restructure'