new structure
should work
apps work