Moved stuff back out of source folder to help with CI