Reorganise libraries and rename application