Moved files around to make things work with PHPStorm
PSR2 code formatting