Updated layout and internal file structure