making the code/namespace organizatin a bit cleaner