superior error handling, taking into account exact error position
reordering files to match classic file structure