Some minor chanages, reorganise files