Changed naming of folders, packages and classes.