Directory restructure

Restructured directories for organizational, catalogging purposes