BZ-7370: new folder/package layout and deps file