folder structure flattening
code style, bugfixes