Moved classes around
Finished Basic commands/plugin shell