cleaned up directory and renamed files appropriately