Updated File structure