consolodated files and added handling for missing dependencies