Added shell & organized structure