Adding package structure for context classes