reorganize directories
cleanup code for hackage