Restructured files to make accesibility by other code easier.