cleaned up old files; added entities folder for .. entities