Renamed files; added general preferences
Did some more things