fixed up code after directory restructure