Changed a little file structure