More module structure amendment

- Merge swar and reduction submoduels ot fix cyclic dependencies
- Remove unwarranted dependencies on those modules and some others

!! Warning !!  Similar branch has to be merged on private repositories