New API migration of project issue was not correctly done considering module organization. This commit reorder files according to the guidelines.