re-sort files (pending yet)
adapt call function to new names
better documentation
reorganizing things (partial)