Cleaning up structure
Merge branch 'work' of https://github.com/matsstaff/stc1000p into work

Merge