Started organizing to fix my OCD

Don't ask