Blueprint Parser reorganization