fixing build
moving things around, adding test app