Reorganize bits and pieces
Handle dots in project names properly