Moved the shells classes into a new package structure