dependencies and setup reorganization