Modified to work with new file structure