Reorganize package + remove cycle dependencies