Changed file strucure