Refactor some class files + Shell Storage.