Changed inclusion of files in lib and framework folder in a single loop