Updated File structure and code