Changed module directories to match other projects