Rename of files and tidy up.

Moving to cortex namespace and making bases more consistent.