Restructure files and paths