Some reorganization and cleaning
Merge with remote friends