Restructuring initial commit