removed some dirs and updated setup script