organize into proper package