rearranged files; interface exception/errors