reorganise files. classes added to lib