Refacoring and clean up, renaming various files