fixed warnings on linux, restructure folders