reorganize packages + stuff