organizing the files, and exception ready!