Changed file structure for clarity.