Changed package structure

Minor changes.