Organized repo II

Because it was becoming messy again.  :expressionless: