move clj src into src/clj for consistency