Updated naming and directories