Restructured file hierarchy to use include folder.