Restructure files to normalize tree, cleanup