Fixed PickUp command group, added narrow and widen commands; Orgenized project in folders