Clean code by moving stuff to where it belongs
Add minimal support for Ceylon