Fixing dependencies and messing around with modules and exports