Organization pt 2

Helping outline where everything goes