Reorganise directories, move towards having MySQL config