Working version to step 2

Fresh version from the server.
Other changes to structure files

Latest from server.
System file updates