v3

Simplified a lot, renaming, restructuring