Moving code around

for later refactoring

Signed-off-by: Daniel Borchmann <daniel.borchmann@mailbox.tu-dresden.de>
Remove defmacro-

it's already in clojure.core.incubator.

Signed-off-by: Daniel Borchmann <daniel.borchmann@mailbox.tu-dresden.de>
Removed defonce-

Not needed

Signed-off-by: Daniel Borchmann <daniel.borchmann@mailbox.tu-dresden.de>
Removed defvar and defvar-

Replaced defvar- by def- (private version of def).

Signed-off-by: Daniel Borchmann <daniel.borchmann@mailbox.tu-dresden.de>