Move file specific things to own package