Working Commit

Changed File and Directory Names to make things more generic.