Fix changes from project reorganization