Added configuration files, reorganized, fixed errors