Rework module structure - docs not finished