moved shapes module to separate shape package, added option to use
custom shapefiles