Reworked Tidy Files file layout and code separation