Refactor

Major refactor and version bump to 1.0.0