files structure fixed.
Merge branch 'dev' of https://github.com/puhw-dev/Monitor into dev