Added composer. Fixed modules issues