Fixed some small import bugs and cleaning the directory.