Reorganization of files and ajusting interfaces & exceptions