Update to VS2013
Project reorganization
Added tests