Clean up

Simplify directory structure and other small changes like renamming.