small refactorings
moved classes to seperate files
added split by first word