Added new package structure