Some more refactoring, bumped version to 0.0.3