reworked module structure
added artifacts