files_path and extra_files_path seems to be broken under different settings, reverting most of the old changes