Moved files

Files were in the wrong directory, and wouldn't be tracked.