Update core version to 0.2.2
Correct class names and files (PSR-0)