Moving files to package and translating comments and name in english.