Cleanup of structure

Restructured packages. Simplified.