basic refactoring finished + missing files added from FTP