Initial Commit of Restructuring #32