moved stuff to single app folder (everything is broken)