Reorganize directories

Now mirrors the parent Copernicus theme
Code tidying

A few code style changes and rearrangements.