Restructure to fit into new project.