More file layout work and getting less working