Moved everything into SPA, pruned some old files