Reorganize project loading