Renamed files, added user class