more files, cleaner code :-)