Cleaned up, centralized typedefs to one file