reorganize listing module files

also cleanup