code refactor and rm unnecessary files....