restructure the context files to a more in line with best practices