Cleaned up dependencies and removed naming override for modules