edited package layout
renamed files appropriately