Minor restructures, bumped to 0.0.2