Added module directory, easier to test