modifying package structure to get around 260 character limit