Restructure files
add background