Fixes for last PR

Apparently it says it can't be automatically merged with current restructure. Maybe doing a ```reset --hard``` then a ```push --force``` would fix it.