General clean up

Consolidating files