Completed refactor of Data types
added scalariformFormat; doesn't run on compile nor test:compile automatically (indented)