new structure

This is the new structure to the files, as under Apache.