Moved classes one level up to comply with PSR-0