Updated file structure and server communication