Add logging, removing unnecessary files, code cleaning.