Some more changes to package structure