Moved files, added Cap stuff