Removed unneeded directory, updated files