Made changes to package structure