reorganize dependancies