Trying to make the CI task run cleanly, moving features to standard
location