Rearrange some files (incomplete)
Fix up the sidebar some