Finished file restrucure implementation