better error handling
move files around