Organization

Reorganized files into new directory structure.