Refactoring for FlexStore
More tests and refactoring
PSR-2 standards fixes
Work on formatters for flexstore