Updated for file hierarchy