hulk: improve separation of files