Reorganise files into package