Changed file-structure