Updated project name and structure