Restruct project