Changing names and package structure