refactored a lot of files again...
solved prob154 :D