Remove logging & added missing module files