Restructured the code layout moving the classes in their proper packages.