no more useless interfaces

According to code style, only one class or trait per file. Lets not generate invalid code.