Modified internal file structure, making it more consistent throughout the Solution.