More initial setup on file structures