fixed deps
reorganization