Massive project refactoring and alpha-finalization