Consolidating

Clearning up some files in preparation for adding signing