Reorganizing again

This time it actually compiles!