Ignoring upload directory
Refactor ALL the things.