Changed file structure and add background