Added camelCase naming convention + improved formatting + added namespaces
Merge branch 'feature/psr-naming' into develop