Remove CoreData as dependency
Restructure global headers