Don't extend user settings holder any more
Fix calculation of BASE_DIR