Restructure files & directories