cleaned up files, ordered navigation