Changed file structures and names