More logical file structure.