moved several modules into places where they make a lot more sense
others will be moved to extras