initial commit, starts with restructuring