Update compilation; Modernize module layout; 

successfully loads in the toplevel now; still needs testing, but in a better place now.