Removed file infrastructure to other module