Updated directory structure and added Schema extension methods.