Renamed main programs to not look like library modules