Detail outline some more. Restructure files.