Refactor directory structure more and more. Created logical separations of conponents.