Completed the restructuring, brought everything to new standard names and commands.