fixed *nix build system according to new folder structure