Maint/master/reorganize project