Moving a few files around
Tweaks and new build