Cleanup Repository

Deleted test files. re-organized relevant code