Moved files to fix dependencies