Ignore uploadable folder, and some refactoring