Feature/psr 2

Moving to psr-2 compatibility