refactored + integreted modules added