Refactored all shape loading; began adding support for other types. Added test files.