Added ConCommands and reorginized files