Renamed modules

Some modules were renamed, this to ease developing.