Moved everything around a bit to make place for additional modules