Restructuring, code-style, new test-structure - WIP

each "feature" will be tested in main-area in a separate header,