Restructuring project slightly