Removed 'Main' suffix from files

was unnecesary and would be annoying from the CLI.