Refactoring of the Core project's folder