implement backbone skeleton
remove moved files
fix merge conflicts