Removed irrelevant packages and moved everything to a more concistent hierarchy.