Reconstruct file layout for cmake build. Delete libpng from 3rd-party package