update structure of appular for testing