Sorting out folder contents to get everything up to where it was
Commented out taghero include file while sorting out the basics