Commit 12

This update contains the start of an overhaul of the current versions.
It still needs plenty of work and old files need to be removed.