Updated file heirarchy