Updated file organization