Reordered

Removed test tank, fixed greenhouse description, moved files around in
folder locations