Started module separation, fixed syntax error