Refactor file scheme & fix BASE_DIR