Restructuring project a bit