Moved files to deprecation, begun unification of input controls