Cleaned up directory structure, fixed tempDir bug