[TASK] Isolate modules to own directory
- Support using password OR apiKey instead of throwing error when no apiKey specified even with a password specified