Reorganization

Reorganized project into multiple files