Updated w/ file utility

Re-organized to new project standard