Cleanup module naming, remove bad deps