Fixed compile errors. Removed some static data from the Shell-class to a new class Data.