Restructure to fit leiningen