new structure
cleaned up dummy app
clean some details