backend + restructuring directory
merge conflicts