Fixed import issues. Each module can now stand alone.