Added module; Renamed main module