reorganize folders and remove TestApp