Simplyfing project structure. Merging scalatra module into normal test module.