Moved extension into mock file structure, like the pros do