Remove unnecessary friend functions
Preincrement
Rename files, namespace