Move files, add trait App (fix 1001)