Updated file names and organization