Changed naming and structure of some files