better file names, added unit testing folder