cleaned up the directory a bit, and fixed the type