reorganzie packages and add vector calc